Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use rwmutex instead of mutex #5732

Merged
merged 2 commits into from
Feb 23, 2022
Merged

use rwmutex instead of mutex #5732

merged 2 commits into from
Feb 23, 2022

Conversation

shuyama1
Copy link
Member

@shuyama1 shuyama1 commented Feb 22, 2022 •
edited
Loading

mutex was added in #5722 to fix concurrent map writes error in new vcr test. However it still constantly ran into concurrent map read and write error, as the previous only add the lock when write data to the map. Therefore, in this PR

  • Add the locking mechanism whenever the map is accessed (including both read-from and write-to)
  • Use rwmutex instead of mutex for better efficiency (which enables concurrent read access, just not concurrent read/write or write/write access)

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 1 file changed, 32 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 1 file changed, 32 insertions(+), 13 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

slevenick
slevenick approved these changes Feb 22, 2022
View reviewed changes
Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change sources_lock to sourcesLock and similar for configs_lock, but looks fine other than that

mmv1/third_party/terraform/utils/provider_test.go.erb Outdated
@@ -231,15 +235,18 @@ func getCachedConfig(ctx context.Context, d *schema.ResourceData, configureFunc
return false
})
config.client.Transport = rec
mutex.Lock()
configs_lock.Lock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe camelCase is the style guideline for golang

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I'll do that!

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 1 file changed, 32 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 1 file changed, 32 insertions(+), 13 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@shuyama1 shuyama1 merged commit 1637d0f into GoogleCloudPlatform:master Feb 23, 2022
@shuyama1 shuyama1 deleted the rwmutex branch February 23, 2022 20:18
This was referenced Feb 23, 2022
Merged
Merged
Merged
lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 16, 2022
@shuyama1 @lcaggio
use rwmutex instead of mutex (GoogleCloudPlatform#5732)
8d9c845
lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 17, 2022
@shuyama1 @lcaggio
use rwmutex instead of mutex (GoogleCloudPlatform#5732)
cf11dea
lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 18, 2022
@shuyama1 @lcaggio
use rwmutex instead of mutex (GoogleCloudPlatform#5732)
8bd08b9
betsy-lichtenberg pushed a commit to betsy-lichtenberg/magic-modules that referenced this pull request Apr 25, 2022
@shuyama1 @betsy-lichtenberg
use rwmutex instead of mutex (GoogleCloudPlatform#5732)
a96afb8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slevenick slevenick slevenick approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shuyama1 @modular-magician @slevenick